Merge "Added streamFile() unit tests"