Break up shop and location tests