RHC tests fixes