Wizard unit tests
re-organized files