Merge pull request #15241 from vdemeester/api-test-coverage

Add more unit tests (coverage) to package api