Refactored BaseTest