Adopt announcements to use DI

Only minor adoptions, remove proxyquire from the dependency list