adjust tests
simplifications and different highlight for labels etc.