To facilitate junit testing, nested Factory classes were added to a number of classes.  For some of those, member methods could be used instead, thus simplifying the code a bit.