tahoe cp -r now copies the top level directory with its children
Fix tests which relied on the old behavior of tahoe cp -r