Hopeful fix for test cases that fail on Travis but not locally...