Extracted VFS - added testing components