Fix up apply and make at least one testcase.