Also, make the other password tests more rigorous by verifying the fs content.
It was actually testing extpass a second time.
Also fixes the failure to run the benchmarks do to the missing gocryptfs.diriv.