Test updates in light of the KDF switchover