Updated and moved esi test