Fix test cases so that they all work with shared cache disabled. FossilOrigin-Name: 52c3ae063e133c5f88cad2c3084cf46218f865ac817ab937e3529d2c6a7af300
FossilOrigin-Name: eedbcf0a0ba91bb8b9cd3d115081ba297e9959fe