Modify location to locationId in fixtures