Additional tests
Add lexing function.
Add a couple of new metrics