Fixing unit tests
merge fix
Fixes for unit tests