Updated builder tests to use @toc indexed by item ID.