Update ControllerTest.
Reformat Code.
PHPDoc updates.