writing more controller tests
Merge branch 'master' of github.com:kronosapiens/xp