Add acceptance test helpers
Add hack to restore subscription test