Add more SetSort tests, clean up a bit