Redirect better to prevent possible infinite loop, update test.
New schema to bring alert_type up to date with what it says it is.