Fixing tests (polymorphic hierarchy collapse)