Fix broken tests from switching to JSON