Refactor fragile spec to use has_field? and has_select? in an attempt to make it more reliable in CI