@PVince81 moving these test into it's own class could improve readability and maintainability - initStorageMock() could become setup() and you can move your \OC\Files\Filesystem::tearDown() calls into the test suites teardown()