Patches to make the testsuite easier to move.

Hello Aaron,

I am working on integrating the test suite in Debian's regular regression tests, and it would help if you would accept the two patches below, so that the test suite and its data are easier to move around.

Have a nice day,

-- Charles