Splited interfaces for endpoints
Some updates on tests and client