cleaned up test code a bit