Some changes to tests, including expected match syntax
up to the end of email validation
Fixed the expect... match testing