giraffe/client: further revisions, unit tests updated