prevents negative waitgroup panic
refactor packages, flags, subscriptions also DRY up builder tests use mockgen