Fixed some files missed in previous merges
Fixed an accidental typo in the cv spec file
Fix to get Promotions controller test to work