Update for later autotools
Make recent tests more flexible

Get tests running better on FreeBSD 10.x