Add TODO reminder to return EOF object on EOF.
Add a couple of failure tests for invalid tokens.