clean up test helper code a bit