LIBCLOUD-625: addressing feedback, fix tests