Fixing RHC tests for Origin