Third batch of removal of TestClass/-Method use

Change-Id: Ie265e181192d88ef6643e00c261dded26b33f551