improved the support for maven-plugin and for integration tests