fixing the rakefile and refactoring FakeServiceClient