Add/refactor tests
added test for sort Condition