refactor failing cases