This should fix the failures for the TeamCity builds around the NotEmptyDirectory() test.