Wrap errors in the test helper that were missed the first time through
Wrap errors in the test helper that were missed the first time through

EwanValentine/dep,golang/dep,EwanValentine/dep,ibrasho-forks/dep,golang/dep,ibrasho-forks/dep,golang/dep