Fix up merge in unit test
Fix up merge in unit test

n054/weave,weaveworks/weave,weaveworks/weave,weaveworks/weave,weaveworks/weave,n054/weave,paulbellamy/weave,paulbellamy/weave,n054/weave,paulbellamy/weave,n054/weave,paulbellamy/weave,n054/weave