Don't use test files that are not reset between runs.
Merge pull request #1329 from kacfengine/test_fixes

Don't use test files that are not reset between runs.