cleaned up test code