CH5 Test re-factoring