Remove old json encoding code, update test for new.