BDD: refactor Setup wizard