Fix bug with code highlightning
when keyword in suffix
Add test for code highlightning