Fix test/setup in a clean environment
Merge pull request #279 from blueboxgroup/fix-test-setup

Fix test/setup in a clean environment