Fix test_filter_with_none_value; refactor tests

The tests were getting unwieldy. It's bad if you have to change all
the test expectations when adding data. This splits the tests into
smaller groups.

This also fixes the test_filter_with_none_value test by adding
a mapping that specifies the field should have null_values. It passed
before, but because it wasn't getting set up right.