Let's see if changing to be order dependent fixes the tests