improve tests a bit and use content_tag for alert messages