improve some test an begin works on highligter