Add test from #7919
Add test for #7574
Add test for #7970
conc031 now deadlocks, due to fix for #7970

We decided that fixing #7970 is more important.
T149 is passing