Added null tests