Replace BuildTestContainer
with use of builder
#5896
Merged
BuildTestContainer
with use of builder
#5896