Slight cleanup in tests
Slight cleanup in tests

Completed the TODO. This is nice particularly since otherwise we get all
of the log output even on success.

Also added statements logging any errors.

zenhack/go.sandstorm,zenhack/go.sandstorm,zenhack/go.sandstorm