Govet testcode

Make test code play nice with go vet.