Merge "CipherTest: Move jurisdiction check lower"