It's not necessary to use alias for this.SafeStream
Fix test cases