Modified TestBase class