Remove special case handling of null values and update expected results

For context, see discussion at https://bugzilla.mozilla.org/show_bug.cgi?id=1000441.