Switched to c++ unordered_map
Cleanup
Fixed most tests