Merge "changed the pom.xml to include proper integration test"