refactor: Improve robustness of patching, add tests (#261)

refactor: Improve robustness of patching, add tests (#261) #99