clean up tests filesystem, and rename gpg homedirs