Fix tests even better than before.

The current tests work on travis, but fail on jenkins. Fix that up.