Begin splitting out maintenance test base classes