Fixing the specs related to streams - take 2.