restored tests and removed their path dependencies at the expense of more outer sends, some of which might again be extraneous