hmm, I think getting the endpoint tests working and worrying about that in a subsequent commit would probably be better (because I've already started collecting and amending these for merging)

Unfortunately, the failing endpoint tests give a really weird error message, I'll have to read the tests to figure out why that's breaking.