allowing test-null to work if passed a null
Adding a check and a backup to the tabexpansion hook