APY-121 : Polymorphic support for models

Small updates for polymorphic testing.