More NFA tests, and some Parser tests