Re-added servotest