working around stand alone test case for FD leaks
Merge branch 'switch'