Merge pull request #764 from tphoney/stabilise_acceptance_tests