Tidy up control data and move utilities_for_testing to safe.test.utilities.