Some test helper functions.

Right, I forgot about the relpath calls. Withdrawn