Some improvements to the tests, to see if they work on Travis.