Add ordering to fix UnorderedObjectListWarning warnings

Ghost User
2020-02-05T12:35:58+01:00

### Short description
Add ordering to fix `UnorderedObjectListWarning` warnings.