Merge "Update testing doc to reflect unit subdir move" into feature/zuulv3