Minor improvements to the shell framework / build
More cleanups to shell framework and lexer test
More improvements to lexer tests