Add tests for MakeStream::singleton