Added some etest module methods to api client
Merge branch 'master' into develop