Minor code cleanup for efficiency, and tests to check the order by clause scrubbing is working correctly and not entering an infinite loop