fix tests ? + settings mail