Cleanup the test suite

* Fix 2 tests which didn't cleanup behind themselves
* Fix the integration tests whose shared "global daemon" polluted /var/lib/docker/unit-tests which is a template for the starting state of all tests.