Error tests & restoring email ones