Merge "A few bugfixes for uncrypt I/O tests"