More tests, more progress on keybase/keybase-issues#216