Adding some more tests and trying to work out ways to test some Wizards