Started rebuiling the unittests, not yet finished though.