Adjustments to auto tests