Integrationtest improvements.