cb1529f Better *Controller test case, doc and implemenation.