Add @or helper and tests