Edited TestBase