fixed tests and made go vet happy