Fixed some parser test issues, e.g. concatentation

Still doesn't parse "funct ..." statements correctly