fix all tests apart from mailers