Fixing xpath conversion. Fixing broken tests.