coding changes based on feedback.  Includes fixing tests and how a
Collection is processed.