Register unit tests automatically

The big conflict to end all other conflicts! :)

Change-Id: I950d1d775752d617d7df56465e6cb187b0c7febb