Cleanup (VFS test moved to others; fields extracted)
Action path fixed