try adding the listen methods to model instances
little more cleanup on the controller tests