Tested more cases related to subclasses using superclass functions as appropriate.