[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16539: Refactored test which failed at random due to relying on collection ordering.