introducing test tags handling