Minor cleanup and comment
Make IntegrationTest end
Use Junit 4.4 syntax
Clean up IntegrationTest
Improve IntegrationTest