Merge "Add base test class to make subclassing possible"