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