Fixed the remaining integration tests