master
tests: fix typos in test comments
TEST: Make it possible to use OSRELEASE with the version comparison functions
test: Fold expect_keyid into create_key and suchlike