Cleanup of some semantic Highlighting Test code