Distinct test directories before requiring

To prevent unintended side-effects at compile time.
Merge pull request #1399 from sritchie/patch-1

Distinct test directories before requiring