Merge "Adding testing functionality for TAG_ROLLBACK_RESISTANCE"