Fixed tests failing due to modified JSON representation.

CoAuthors: rbkillea, cgwalker