Test Fixes - Setupwizard - test.properties
Test Fixes - Setupwizard - macros
Test Fixes - Setupwizard - tests