Got the JSON tests working too