Cleaned up random file/dir generation
Better integration tests
Better file system tests