Fixing the last (?) unit test failure in rc