Added -f option and test coverage for it.