code review, fix unity container

Signed-off-by: Artsiom Marozau <Artsiom_Marozau@epam.com>