Fix broken rhc_extended tests