Fixing tests based on new TOC changes