master
test: Fold expect_keyid into create_key and suchlike
TEST: Explicitly use bash
tests: remove some trailing whitespace