test-fixes - setup_test clean except for manifest upload repeat
Merge pull request #27 from thomasmckay/test-fixes

fixes #4743 - setup_test clean except for manifest upload repeat