initial changes to TorTestParams
Merge conflict resolution