Maybe this really is causing problems.

Revert "a number of changes to the testing framework so that transfers and model file are not overwritten"

This reverts commit 4e793efdabd3449c706db2f665e82af2bda268b2.