fixing unit tests
merge fix