Adds (and fixes) tests
Highlighting fixes