[WIP] Unify controller and integration tests

This pull request is for the following project: https://github.com/rails/gsoc2014/wiki/Ideas#unify-controller-and-integration-tests
Do we have to drop this parameter? And if so, shouldn't we clean it out more thoroughly?