Tweaking test to work in any sort order (fails in Travis but not locally)