Re #8365 Fix CPPCheck and Doxygen warnings.
Re #8365 Removed unfinished test.