fixed unit tests for linux and mac