Get rid of manual test registration

Change-Id: I9ce7f513937390b66c00ab3cc27eeaed0641620b
Merge "Get rid of manual test registration"