Update tests to use generic keys.