Update tests for new json

Also updated the json to use result_count_string for a pluralized string
as the result_count is needed for the analytics ping.

Removed requirements for type in the class as we aren't using for
styling and it isn't functionallity needed.