Rename client specs
Add some mock clients and tests