repair tests on update / remove
Clean findElement()