Re-enable some suppressed tests and update them for the SampleKey API.