Changed <COMMENT> to [COMMENT] in usage, as it is optional
Added unittests