Fix some NPEs and make ChunkVisit tests join together.