Fix tests, reorganize wizard slightly