Remove debug
Add tests for the advanced client
Add inline doc