Datastream versions working
Updated tests