Add non tested classes
Worked version