Also update tests. None is not a valid value...
This way, we can test more feature of them, in particular check for different errors, which were causing test failures.