Builder unit tests refactoring Upstream-commit: 16d0a8959381f7bc7c0fb9afbb9dd2f75431d48a Component: engine