Announcements Controller Spec (and slight refactoring)

For #404