Refactor zerorpc test as needed