Fixes for rhc_extended tests