Revert "Remove obsolete test registration code"

Will commit better solution

This reverts commit 214ba7da8d81cd63c79e7d74f65d1733bbf8914e

Change-Id: I7cbd0e5052f50f8a7f48526c49aea330c4cfcf16
Merge "Revert "Remove obsolete test registration code""