Issue #2801817 by Mile23: Inject services inot SimpletestTestForm and functional cleanup for the test_discovery service