fixing tests
fixing client