Fix tests in multiple directories

The unit test hook wasn't picking up subdirectories so a test had gotten
out of whack.  This fixes the hook and re-whacks the test.

Change-Id: I38134ff550b9ac38cb4eb673b63374ba4dd7be11
Merge "Fix tests in multiple directories"