Test cases refactored for new TOC styles