Use CBS in PRH testsuites, part 2