Patch up the location model tests for factory changes