fix tests for nexus s and make command timeout correct
beginnings of xpath support