Update marionette.controller.js and controller.spec.js

Companion to pr #1122