Update core-model-test to work against a 7.2.0 legacy controller

A few fixes to the subsystem-test stuff as well