Allow running tests in subdir separately

Change-Id: Ifcf12a3d88c6684e3197aec3103f5450b9b1666c