added more tests, simplified sorting DSL.