Redid ObjectIdJsonConverter tests.
Renamed and cleaned up ObjectIdJsonConverter.