About these **todo** scenarios, should they be included already or only when they're developed (on behat) ?