Fixed test case variable clash with 'folder'