Improve test case of folder names