Edit of parser and testing code