Write some more tests
make the test not lie
Fix searching tests, including one that hits the API. Also other cool stuff.
Merge branch 'more-tests'