Moved common test logic to base test class