remove all NULL's
fancy Add() tests for simple cases