Fix tests since we don't default to JSON anymore