Add controller helpers
Remove unused code
Improve MockUser