Attempt to fix broken unit test (seems order dependent)