Cleaned up test code
Cleaned up test code