Added a test to check a valid mail and small adjustments