fix some more integration tests