Changes to revert the overloaded function signatures in testutils and migrate existing special tests to use `tk/boot-services-with-config` were committed in 56ddb9a.