Removed TestBase classes