Make test order-independent

This should fix a failing test