Merge "Pull shared testable subclasses into their own files."