Add more complexity to TOC test