Fix for tests that fail when run in a particular order
Hopeful fix for failing test that only fails on Travis