Small changes to xpaths to make them run in both existing and with updated Ember