Fixes for unit testing
Fixes for nested dictionaries
Nosetest adaptations