Tests fixed
Properly disabling polymorphic models