more simple controller tests
Merge branch 'rails-4' of github.com:koelncampus/kc201x into rails-4