Hygiene: Add sub-directories to phpunit test

Change-Id: Ie5bb127f1ba36bd799f87535b14cd3712ad08a3c