Fixed Optics class. Sees to work in the tests