New style of TOC
Update tests