Converting to last stream API + fixing tests
Pass null files through
Supporting streams