Fix rollback from new state (unload record)

Add more rollback tests