Diagnostic in test/better code coverage