make folder test more resilient. change expected error message for bg removal in upload