Fix the awaiting issues thanks to the Mailin team API upgrade.
Update the Unit tests.