Remove BaseTest class for better readability