Merge change I27b1bb90 into eclair-mr2

* changes:
  Refactor vCard test code and modify unit tests.