Fix null tests