cleaned up tests
cleaned up test code