Sort tests

Add some more test cases.