Modernize tests, fixup travis