Once the DPath changes are pushed up, any tests that use the text() and /* annotations will fail. Modify these tests so that the original purpose of the test is still being fulfilled. Once updating, verify that tests work when rebased onto the latest dpath branch.