hirif:  Initial changes to support adding location of test