Resolves #20  Fixed element locator XPath and abstracted it out to a more testable compoenent.