...in one more case Plus some minor test tweaks, diagnostics improvement and important comments Original commit: 06d27a9efa
06d27a9efa