added methods to api
added server side tests
Merge branch 'server-tests'