Update to fix Parser, minor updates for tests, command line console