master
test: Fold expect_keyid into create_key and suchlike
TEST: Conditionalise usage and testing of key invalidation