remove .condition from xcon fallback and refactor related specs