Merge pull request #15931 from vdemeester/api-client-ps-coverage

Add more unit tests on api/client/ps package