Fix tests that depend on the configuration remaining unchanged after other tests
Merge pull request #10 from aredridel/fix-test

Fix tests that depend on the configuration remaining unchanged after other tests
Merge remote-tracking branch 'upstream/master'