Fixed tests for GenerateKey and Marshalling
gofmt and ordering imports