Migrate remaining integration tests