Cleanup CSS. Add test highlight functions