Finished new syntax branch and all test are passing again