Some more changes to the Campfire test