Auto testing improvements