Testing related fixes
Improvements to the 'vs' command
Cleanup