Fixed a bunch of tag tests