Fix for two unit test failures