Code clean up
Removed env test code
Removed env test code
Refactored to JUnit TestSuite for integration tests