One of the distro_id comparisons was listing "opensuse", which is a

family but not itself a distro ID (which is instead "opensuse-leap" and

"opensuse-tumbleweed"). This change fixes that and updates the unit

tests to verify the now-included cvs package.

Ran unit tests.