Done fixing ESTEST JIRA