fix broken tests
fix broken tests
client specs are now side-by-side with the code