Replace key generation with fixture usage in some tests