95% covered, moving mailers to a seperate tests
merge fix