Fix test suite to work with latest Automake releases

And increase version numbers for 3.6.1