Fix verifier test base testdata directory after merge conflict am: e1305768f6
am: fc4971ba52

* commit 'fc4971ba52b34d2b138cc975d328d1d586e84aea':
  Fix verifier test base testdata directory after merge conflict