Bail from non-patch data attrs with continue not return. Improve test.