Fix for flakey tests in rpc package.

Signed-off-by: Simon Leung <leungs@us.ibm.com>
Potential fix for windows gocd timeout.

Signed-off-by: Simon Leung <leungs@us.ibm.com>