Merge "Update base test class."