#32: Adjust multi-env to respect multi-site, make test path expansion a utility.