more changes to parser and test