converted long running tests to integration tests
checkstyle corrections
removed unused variable and inner assignment
checkstyle corrections