Fix font-locking of functions with underscores (issue #63)
Bump tests: fix some, move expected failures to separate test cases