[software test models]: Cleaning of project, added DEBUG() macros