Fix plenum remove function

Added unit tests and made adjustments so that plenums are properly
removed.  Plenum branches are reassigned to the zone mixer or splitter
depending on the type of plenum.