Ensure order decorator is required, fix test fragility