Refactor wizard view tests a bit.
Refactor wizard view some more.