Streaming #18: handle null values and more tests