Fix  certificate's expiration date and sync with common lib
Fix unit test
Merge pull request #417 from Icenium/fatme/fix-certificate-date

Fix  certificate's expiration date and sync with common lib