Test were not passing due to mockSocket change.  All unit tests and cob_spec tests now green.  Rearranged highest level of server slightly.