fix tests, and try to improve code highlighting on some examples