Use testing json assertions

Big branch (apologies!) but mostly mechanical.

Also updated dependencies.
I believe this blank line should still be there.