WSM PATCH - Make tests run in a deterministic order