Make testDirectory optional in the test main preparer
Merge remote-tracking branch 'origin/master'