Should fix unit test failures