Removing CV part and adding a unit test.