d'oh, bit by the duck!

It appears #1345 was a little too deep and all the tests started failing
because they could not find testsetup.  Adding it back and we can re-
visit
Merge pull request #1348 from dajohnso/revert_duck

d'oh, bit by the duck!