* Move some message utils out to their own file In another attempt at import cycle breaking * Also add the file * Move tests