RHC extended tests fixes