Fix for cross-site tests: Using key generator