I spun off #5895 for the remaining dangling unit test suggestions in general