fix patching tests
update rollback handling for modules