Fixed ESTEST-8 issue