Modify fixtures to use all location keys instead of locationId keys