Merge "Remove unnecessary deprecated base class from a test class"