refactoring fake clients