Fixes to, test for metadata streaming.