Updated wizard flow and added some test drive logic.