(Discussions) More unit tests based on coverage review, and associated fixes.