Reorganize tester so that directory errors are properly handled outside of the transaction retry loop