Fixed routes.rb and a couple mis-fixed deprecation issues.
First round of integration tests