Reinstate core-model test controller 7.1.2