Add some Rollback tests
Fix some bugs