Further work on python-client driver to deal with variable success codes