Improved tests for new JSON