Fixed unit tests
merge