Fixed bunch of stuff
Modified TestBase class