Add tests for client