Fix tests broken by hasty merging
Fix tests broken by hasty merging

kinvolk/scope,weaveworks/scope,weaveworks/scope,kinvolk/scope,kinvolk/scope,kinvolk/scope,weaveworks/scope,weaveworks/scope,kinvolk/scope,weaveworks/scope,kinvolk/scope,weaveworks/scope