More tests adjustments