Added Location test, plus removeItem for Locations.