Fix some unit tests and fix debug string for maps to null