fixed for themes

some test disabled for now since it is to be decided how to refactor the code to be able to test snippets of code that are currently implemented as ExtraMailer private methods