Another attempt at getting tests to pass on travis.