Halved the spec running time 

* Use specific xpath to match on fields during form completion journeys
* Approximately halves the spec running time