Add more tests for VsUtils