Add S2S tag testing