Added new private variables to CVector class for refactoring
Quick and dirty solution for new testing of 100% test