fixed all classes and tests