Update more tests to the new EH scheme.