Add correct tag reset and tests