Refactor expectations of Onigmo spec