Refactor TestTagManager (WIP)