Make discover run the same tests as 'make test'.

We use test parameterisation in test_deferredruntest, but hadn't
defined a load_tests hook to inform discover of that.

Change-Id: Ib32d7cf88b1a9e311476a5286357e46e65de1f1f