Added null tests and updated test email param