Integration test fixes

there are a couple of changes that make `rake test:integration` run locally without failing tests. hopefully that also fixes the tests on travis.