use new Groovy approach for integrationtests
removed useless code