Revised per review comments to rename test files and rearrange input files.