Tests for TDI issues already fixed
Fix a couple others caused by failing to return NotImplemented or to override names correctly.

closes #17250
xref #19042 
closes #19043
- [x] tests added / passed
- [x] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
- [x] whatsnew entry

  
  
  