Change design of tag model test