Fix comments starting point and tests
Improve like starting point