Fixes to Acceptance test and removed the cloud module
Mail module fixes