initial commit for phase 1 integration with UF
fix for vfs tests