Merge pull request #612 from bjhargrave/master

Use different tmp files for each test method
Use different tmp files for each test method

Using the same file created problems on windows when it sometimes could
not be deleted.

Signed-off-by: BJ Hargrave <bj@bjhargrave.com>