modify unit tests for the tag support