Fixes #9044 - fixes invalid mac in tests
Also do not reset invalid mac address to nil so we can propagate propervalidation error.
Fixes #9044 - fixes invalid mac in tests
Also do not reset invalid mac address to nil so we can propagate proper
validation error.