Added TestBase feature and did some renamings