Announcements Controller Spec (and slight refactoring)

From #404