Change test unit template
Remove parenthesis in user controller
Remove parenthesis in password resets controller
Merge ../x0y0