minor tweaks in an attempt to fix an intermittent failure -- adjusted...

minor tweaks in an attempt to fix an intermittent failure -- adjusted iteration in the source and did cleanup to ensure tempdir doesn't exist before testing