Get rid of manual test registration

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