Fix for unit tests and validation in the wizard