Add TestBase, rename some tests, remove some old versions of tests