Accept None as value (will be converted to empty dict) + test