Moving SortConditionTest into the request test package