[WIP] Cover controllers with tests