Merge "Moving tests in multivalent locations to remove the need to copy files around and confuse developers." into main