Highlight test

This has the classes and the test for the issues we have with highlighing