fix client library & tests to work with changes made in