Also simplify the tests. Fixes #2849. R=golang-dev, bradfitz, r CC=golang-dev https://golang.org/cl/5643045
Attach a file by drag & drop or click to upload
