Fixed mail message tests
Fixed CS