Added additional null tests