Minor issues in integration tests