Tests have been organized, corrected and fixed