Merge "Fix test_delete_locations to be performed by admin"