clean up test code a little