Revert "General further tidy up of the test base"

This reverts commit f5c2173bd9f4bb43a07838d7c8d3585d2568baa7.

Change-Id: I14566d0c07aef72d41c089e7478af8fd09fb9d8f