Remove obsolete test registration code

Change-Id: I5c75f1132b55db53617b8c0d406e51ca173d1b7d
Merge "Remove obsolete test registration code"