remote mailservice test
Fix unit tests