#230 clean up test cases for select-based TOC