Change on wps_es.sh, more testing