Fixes broken specs by refactoring order setup.