[#703 Wizard] Code cleanups
[#703 Wizard] Update test