Fixed ESTEST-67