Rework test block to consider use of file extention in full filename; add test to ensure this case