added watch stream and pending tests