Clean up some test helpers.