Added suggested changes. Less functionality of BaseTest exposed to derived tests.