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

This PR resolves issue: https://jira.ez.no/browse/EZP-21734

This should fix some random failures appearing in a last couple of weeks.
It is awkward to account for these and hopefully we won't have to do much more of it.