Fix null.cmp tests.

@bug W-2256422@

@rev tbliss@
Merging origin/goliver/master-pending-null-cmp into master