Added tests for upgrading vCards
Move decoding vCard properties to start of upgrade.