Merge "Provide a full path top level to test discovery"