ea7fa59 Revoke most legacy test cases to new style.