See comments

Hi
The only one mistake is in controller.
Test is OK.