Add more unit tests (coverage) to package api Upstream-commit: b985dca5783f8e5bc067b9f79d8a7f53f71536e6 Component: engine