Nail Down Integration Bugs

When I extracted this, I failed on some of the integration points into Rails with RSpec. This branch should fix them for the next release.