parser and test changes