Fix integration tests, broken by location refactoring