Fixed null tests