Followup for initial tests

Hoo added some helpful comments on
I5e23846b5161c8bd380b0de28e519de5b98de794 which are addressed here.

Change-Id: I3b4f8f21ebd2ae8d7067afa401a8f312745115a5