Fixes the tests so they work locally too, not just Jenkins. Eliminates l...

...eftovers from previous tests affecting other test results.