Cleanup unpack directories, download the right URL for tools

Just bug-fixes from running test on a machine that doesn't actually
have the tools pre-installed.
Simplify string handling