63985220 controller tests

References: https://www.pivotaltracker.com/story/show/63985220