Fixed acceptance tests related to folder management to work without ugly sleep hacks.