Update the tests for the new API. Of course everything is failing. But we'll deal with that later.