minor fixes for a few integration tests