Change tests to accomodate new parser behavior