More test fixes
Clean up sorting test