Fixed references to python UserDict to support both python2 and python3
File case name change to be consistent with the test code
Fixed problems with UserDict when using it in python 2 and python 3. Code should be compatible with both now.