Add test to ensure switching from non-null to null works as expected

Add test to ensure switching from non-null to null works as expected #1221