Updated test, section, fixed some null comparisons