402 fix tests broken by merge and Category sort_order validations

This doesn't fix the cart problem, but that's a separate issue. Resolves #402.