Yes, that would be definitely better. However, I think this is a good stop gap measure till #71 gets done because it will take time to go through each test case and see what files are created in each of them.