Fix contents test, new client API