Fixing config unit test for Windows
Cleaning up unused blocks