Fixed json properties.  Fixed unit tests.