Improve a couple of test error messages too. R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/8661045