Hygiene: Echo/tests/phpunit/ directory structure should mimic Echo/

Change-Id: I4867d09bb815d621f9feaaf7b8a541e5d817e0d2