Adjustments to make sure automatic tests works