Updated base test class