Fixing tests, mostly CVC (account setting?)