improved reliability of certain integrationtests