Fixed up help message
Store the original file name
Fixed unit test