Merge commit '23eb822369952931935589a8b838929b4c044fba' * commit '23eb822369952931935589a8b838929b4c044fba': Refactor vCard test code and modify unit tests.
Merge commit '23eb822369952931935589a8b838929b4c044fba' * commit '23eb822369952931935589a8b838929b4c044fba': Refactor vCard test code and modify unit tests.