Unit test fixes unrelated to the primary commit

Unit test fixes unrelated to the primary commit
that were probably causing the jenkins unit
tests to fail. I think some cleanup mechanism
deletes the files created in early steps which
are needed in later steps of the shell script.