listen for invalid, not error
use number of assertions, not another var
Merge pull request #3378 from robrobbins/patch-collection-test

Collection spec is listening for "error", when it should be "invalid"
Order should trigger a sort iff order was changed
Merge pull request #3381 from fastest963/orderSort

Order should trigger a sort iff order was changed
Cleanup redundant variables in sort
Code style cleanup in collection tests and add an extra sort test