Tests updated, major structural updates, VFS2D test started