Add TEST and PARTNER control tag