Fix unit tests after rename of controller: