EZP-21734: apply sorting to prevent random test failures
Merge pull request #562 from ezsystems/fix-EZP-21734-test-fail-sort

Fix EZP-21734: Cleanup tests failing because of fixed ordering