The goal of our research activity is to explore new measurement concepts using diffractive optics. One important application is the testing of optical surfaces, in particular, aspheric lenses. For this purpose we design and produce computer generated holograms (CGH). At the same time, we develop flexible measurement techniques that enhance or even replace static null correctors. In addition to CGH for interferometry, our in house production facilities allow to produce diffractive elements and micro-optics for a wide variety of applications such as UV-measurement systems, beam shaping applications and wavefront sensing.