Fixed some parser bugs and added test script code