Fixed py2.6-ism properly
Fixed client tool tests on systems without /bin/true