Several adjustments to run integration tests