Revert back to explicit test identification.

We haven't setup load_test hooks, and trunk doesn't actually work with
discover :(.

Change-Id: Id7d1a48251c4f9e4147815f9effc2239645869d5