Change test base class registration so Jenkins does not run into problems

Change-Id: Id176c2000f0a22cb8205a6c0b6e40e00a043f698