fixup tests to reflect changes to client API