Updates parser (just 80 failing tests remaining)