View testing, misc. changes.
Controller refactor and associated Writer changes.
Fixed testing failures.