Adding stream done callback, tests, etc.