Tests pass again.  Flows, phonehome improved