more cleanup, putting more in the testing utils