code highlighting, test fixes