Fix existing tests and add new tests for highlighting with default config