Split into multiple files and add some tests
Add some body to JSON tests