Further refinements of testing to work with python-libraclient