Fix wizard

I think all known issues in wizard is solved. This PR address issue #1010.

The unittest for the issue is skipped since it will caused a problem to other test if we run `make test`