Several tests adjustments