fix a few testcases; rpc_server register changes
Merge branch 'develop' of github.com:chineking/cola into develop