Added JSON key support to DataAPI tests