Finished refactoring CVController Spec