Test-ES refactor