Fixes and tests for media_controller.
Closes #74