Consolidate crypto domains tests

This PR also includes the fix to avoid crypto-domains spurious failures, but I'm not sure if it should be included. Please let me know if we don't want to include it and I'll update this PR.