fixup getting file name and tests accordingly