UnityVS files

and some more tests