Fixes #7912 - Wizard path error and tests