Add json tests

   Test that all our JSON files are valid. Fix the two files that currently
    aren't. Fix #1413