Add explicit ordering for test to resolve part of #480