Fix tests that broke when the batch key metadata was added.