Fix classes and test methods