1.5.8: Fix integration tests

Sometimes, an integration test could fail because it was trying to
create a folder while another folder had the same name (409).