Make all the tests run and pass or find out why they don't

Make it possible to select the syntax variant.