[#1674] Fix tests to run with new version of lib
[#1668] Fix mailer.test.html