More tests for better coverage
Made "unset NULL" optional