Add controllertest.  Not tested.