Parsing now passes all the tests