strike out "assured" or "secure" text when necessary; refactored tenancy as_json tests