Merge "add unit test for --from-file option"