General further tidy up of the test base

Change-Id: Ibc025dc2871e32726e6a1a1765e8454d49958759
Merge "General further tidy up of the test base"