fix up tests and add test for recurring with resource change