Many geodetic and industrial instruments utilize precise angle determination. Metrological calibration and testing of such devices is very complicated, due to the large number of angular position values generated, and often cannot be accomplished using classical means of angle determination. Therefore a special comparator (test rig) capable of calibration geodetic and other angle-measuring instruments and implementing multiple references for angle determination has been created. Several modernized optical devices were used on the test rig, together with the implementation of a special calibration method. In this paper the construction of the rig, modernization of the optical devices, calibration, and some results of measurements are presented.