wip: update how patching is done in tests