Addressing review comments and fixing further corner case

Addressed comments from code review and found a further corner
case while working on those with one-off nodenames that sometimes
get added to clusters.  Tests added and behavior fixed for those.