Fix test suite key/req generation.