hopefully make a few more tests pass on Travis