Moved a few things around, to simplify taglink and tests