Fix failing file deletion test and add more tests for blank/nil values