Fix up cucumber tests to match refactor
Merge branch 'feature-certificate-campaigns' into staging