Added location search and delete funcs and hostgrps and location to org tests