Fix comments starting point and tests