DATAGRAPH-411 - Fix test execution order to work around test failures for now.