Initial changes for Go lang testing code