Changing the encounter over to be json
Changing names
Correcting the tests, and attemptng to correct a call to it.