Add tests and fix Client