Fixed tag field and ignore the test on upstream