Merge "Have all test case to use a single base class"