Name is null tests rewritten