Fix 386 structs to make test.go build and run
Merge pull request #1 from zachaysan/fix-386-structs

Fix 386 structs to make test.go build and run