Convert tests to the new EH model.