Fixing unit test suite