Added JSON tests