Fixes Order model spec
Fixes Subscription spec