Add comments
Use the highlight_caret_scope option to improve test coverage

More tests will come later