Unit tests run with refactored controller --- but controller code
doesn't work yet.