Second batch of removal of TestClass/-Method use

Change-Id: If9fadf93d75ad0a23d5a20b1714589edd5da5b83