[OEM-258] updated API calls and associated tests
Merge branch 'jira/OEM-258'