Fixed unit tests
Fixed unit tests