Fix 386 structs to make test.go build and run