fixed unit tests
fixed unit test errors