Made two test files more robust.