Delete a lot more superfluous tests.  Fix an implementation bug introduced a little while ago which caused deployer to always use a real gear client.