Fix the pkg_version test
Convert over to Kyua
Fix search test
Fix the annotate test (just need to fix pkg annotate to work properly
now)
Merge remote-tracking branch 'origin/pr/957'

* origin/pr/957:
  Fix the annotate test (just need to fix pkg annotate to work properly now)
  Fix search test
  Convert over to Kyua
  Fix the pkg_version test
Fix pkg-which glob

Fixes glitch introduced in 49599f003babc8f0e7f7a382cb95197540b557cd