Fix test set up - need to supply user to amazon backup now
Guard against rare but possible case for file groups related cfs directory