Fix tests.
Fix tests.

Unfortunately, changing the handling for split lumis affected
many tests, because all of the tests contained split lumis. I've
added two tests for the split lumi case, and changed some of the
others to not contain split lumis.

matz-e/lobster,matz-e/lobster,matz-e/lobster