VCS Tests Refactor

Using more shared codebase now that we have access to VersionControlService.