Changed test kernel to do index checks on the maps