get the tests passing, and clean up after myself.
Further clean ups to not leave temp directories around