Added a bunch of test cases for highlighting