fix issues in integration test