Attempt to get more tests passing on travis ci.