Added highlighting and tests