Improve wizard test coverage