Fix tests and send e-mail on site create

Fix tests so that registration is un-effected when we push w/o SAP enabled