Merged TestBase and TestMethodsBase classes