Removed double initialization of SNType attribute.
Updated diagram with new classes.
Changed candidate to candidates in CandidatesCatalog. Added test section.