Ugly soluion to streaming volume files added. Test code not removed.