Cleanup some semantic Highlighting Test code