testkit: small cleanup