Bugfix and changed highlight class for testing