Extending tests (combo) and fixing pom.xml to enable maven build.