modified the parsing and testing infrastructure