[4.2] Added More Filesystem Tests

Can you change this back to how it was without all the changes. It was fine how it was. I only asked you to add a simple check for existing code, not totally redesign all the tests.