Fixing some broken tests
Completed orderBy feature