Fixed broken tests but working code for a third time now.  This is only reinforcing how much I dislike unit tests now........