Fixed broken commenting
Ported more comment controller tests