Cleaning of classes and adding testing libraries