changes in rollback method, fix units tests