improve tests, attempting to fix Travis CI