Fix a failing subclass test due to a change in master