Fixed ESTEST-112