Fixing unit tests
Fix unit tests