Added get CVS support
Improved test