Refactor Counter.SKIPPED to Counter.TODO