added test to assert value gets set to null on unset
Merge branch 'hotfix/unit-tests' into develop