Updated tests
Merge
Turning off e-mails for staging
Merge