Fixes unit test failures