Tweaking tests to work in Travis.