Fix test assertions that depend on undefined row ordering#3007

clayly wants to merge 2 commits intoeclipse-hawkbit:mastereclipse-hawkbit/hawkbit:masterfrom

clayly:fix/test-ordering-assertionsclayly/hawkbit:fix/test-ordering-assertionsCopy head branch name to clipboard