Add more unit tests, reduce the number of rows that we know are empty
that we iterate over while saving by shrinking the column set that
we scan as we go along.

Change-Id: Iebd817d9a8a01fa6abeaa24c4aace92233313e0f