ADD: Improved test code to include testing against a directory tree