I think what I'm implying here is to actually do the refactoring here to app objects with the patch to allow for data driven testing and not check in the duplicated code.