The Hybrid Wave-front Sensor (HyWFS) has previously been developed as a combination of a Pyramid Wave-front Sensor (PyWFS) and a Shack-Hartmann Wave-front Sensor (SHWFS) to capture the desirable properties of each when operated with an unresolved guide beacon. A pyramid prism placed at a focus divides the beacon light into four beams. At a reimaged pupil, a lenslet array creates four separate spot patterns on a detector. The measured intensities may be analyzed both in the manner of a PyWFS and a SHWFS, generating two approximations of the wave front that together achieve the high sensitivity of the PyWFS and the high dynamic range of the SHWFS. Given its inherent sensitivity, calibrating the HyWFS is challenged by the effects of local vibrations and air currents in the laboratory. To overcome this problem, a prototype HyWFS has been built that features a closed loop tip-tilt control sub-system. The design includes additional pupil planes, a Fast Steering Mirror (FSM), and a tip-tilt sensor. The prototype HyWFS will be calibrated with low-order Zernike polynomials at a variety of amplitudes to confirm the sensor's sensitivity, dynamic range, and the effectiveness of the tip-tilt control loop. The effect of the tip-tilt loop will be quantified by comparing calibration qualities while the loop is active and inactive. The residual wave-front error is anticipated to decrease with active tip-tilt control in both the PyWFS mode and the SHWFS mode. With improved accuracy, the HyWFS is another step closer to on sky operation in a closed loop adaptive optics system.