Fix some integration tests