Added MatchCode (declarations + comments) + tests