Adjusting tests to try and get them to pass on travis-ci.