WIP: More work on chunked/interleaved tests.