Make relevant classes extend TestBenchTestCase

Change-Id: Iadaa13540fa1068965de17d829d97b896b249e23