Add test controller and view.
Merge remote-tracking branch 'origin/master'
Fix mapping syntax error.