Update tests to stop using simplejson