Fixed ESTEST-106