getFileName and getFilePath added, tests updated