Fixing controllers tests
Merge branch 'master' of github.com:geronimod/ideas