Fixes for tarball management in tests