Fixed failing JSON tests