Merge "Fix nonce uniqueness tests" into main