The patch below simply enables `lexical-binding` in all the test files. As far as I can tell, it's all that's needed (beside a missing `require`). Stefan