Followup on refactor

@spikebrehm I worked a little on your pull request. Lots of test changes.

This will break on rails 2 apps. I'm not sure if there is any way to automatically include the middleware since railties are a rails3 thing. Is there a workaround for this? It's a pretty big deal. 
this line is particularly questionable