Bug fixing in integration tests