Fixed build in OSX (fixed unit tests)